Auto merge of #2015 - alexcrichton:fix-nightly, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 1 Oct 2015 16:44:57 +0000 (16:44 +0000)
committerbors <bors@rust-lang.org>
Thu, 1 Oct 2015 16:44:57 +0000 (16:44 +0000)
commit138d2229d0976fa9bcd8d3c5acb3f4a6c5fbb902
treeaa29a88c36ccd41121c4941a42852dde56a962ba
parent7931e58cf82d8b9d7d1f1cc9d631166fc8f8d202
parent8995f3031e232f3f3682394f24905b3296f6c380
Auto merge of #2015 - alexcrichton:fix-nightly, r=alexcrichton

Some output of failing tests have been tweaked, so update the associated tests.